Pick up a few old NULL->nullptr conversions that are stuck inside __APPLE that
authorRobert Lipe <robertlipe@gpsbabel.org>
Mon, 3 Dec 2018 04:49:33 +0000 (22:49 -0600)
committerRobert Lipe <robertlipe@gpsbabel.org>
Mon, 3 Dec 2018 04:49:33 +0000 (22:49 -0600)
tsteven4 dodged around since he couldn't confirm.

jeeps/gpslibusb.cc
magproto.cc

index f0fa63bf5b28fde106dbdb4b0555760dc06b0bfc..f60f1d5f9dfde377928da1ec2b04d41cd1349e4a 100644 (file)
@@ -98,7 +98,7 @@ char** os_get_garmin_mountpoints()
 {
   char** dlist = (char**) xcalloc(2, sizeof *dlist);
   dlist[0] = xstrdup("/Volumes/GARMIN");
-  dlist[1] = NULL;
+  dlist[1] = nullptr;
   return dlist;
 }
 #else
index 1dbdbe0d3eb56c832ae7b41eae86a6bb8ccf56be..e3e44173ff6c0594dbcc1147374e41ec1d63d825 100644 (file)
@@ -1569,7 +1569,7 @@ const char** os_get_magellan_mountpoints()
 #if __APPLE__
   const char** dlist = (const char**) xcalloc(2, sizeof *dlist);
   dlist[0] = xstrdup("/Volumes/Magellan");
-  dlist[1] = NULL;
+  dlist[1] = nullptr;
   return dlist;
 #else
   fatal("Not implemented");